From: Florian Müllner <fmuellner@gnome.org>
Date: Sat, 9 Jul 2011 15:23:03 +0000 (+0200)
Subject: power: Remove _checkError()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8075
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fda4fc674d701a73bca6b9249f9eef7be10e3d1b;p=gnome-shell.git

power: Remove _checkError()

On error, we tried to kill and respawn gnome-power-manager, but
as of commit c5676900 the DBus interface provided by g-s-d's power
plugin is used, so the respawning does not have any effect.

https://bugzilla.gnome.org/show_bug.cgi?id=654300
---

diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index fe757ec36..a64a2ba6a 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -93,7 +93,6 @@ Indicator.prototype = {
     _readPrimaryDevice: function() {
         this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(device, error) {
             if (error) {
-                this._checkError(error);
                 this._hasPrimary = false;
                 this._primaryDeviceId = null;
                 this._batteryItem.actor.hide();
@@ -145,7 +144,6 @@ Indicator.prototype = {
             this._deviceItems = [];
 
             if (error) {
-                this._checkError(error);
                 this._deviceSep.actor.hide();
                 return;
             }
@@ -176,21 +174,12 @@ Indicator.prototype = {
                 this.setGIcon(gicon);
                 this.actor.show();
             } else {
-                this._checkError(error);
                 this.menu.close();
                 this.actor.hide();
             }
         }));
         this._readPrimaryDevice();
         this._readOtherDevices();
-    },
-
-    _checkError: function(error) {
-        if (!this._restarted && error && error.message.match(/org\.freedesktop\.DBus\.Error\.(UnknownMethod|InvalidArgs)/)) {
-            Util.killall('gnome-power-manager');
-            Util.spawn(['gnome-power-manager']);
-            this._restarted = true;
-        }
     }
 };